@hoknie/aip 0.2.0 → 0.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/app/application.js +7 -1
- package/dist/app/application.js.map +1 -1
- package/dist/feature/agents/clients/agy/guard.js +26 -8
- package/dist/feature/agents/clients/agy/guard.js.map +1 -1
- package/dist/feature/agents/clients/agy/permissions.js +9 -1
- package/dist/feature/agents/clients/agy/permissions.js.map +1 -1
- package/dist/feature/agents/clients/agy/runtime.js +7 -1
- package/dist/feature/agents/clients/agy/runtime.js.map +1 -1
- package/dist/feature/agents/clients/opencode/runtime.js +12 -1
- package/dist/feature/agents/clients/opencode/runtime.js.map +1 -1
- package/dist/feature/agents/types/index.js +1 -0
- package/dist/feature/agents/types/index.js.map +1 -1
- package/dist/feature/agents/types/mcp/env.js +54 -0
- package/dist/feature/agents/types/mcp/env.js.map +1 -0
- package/dist/feature/observers/services/observers.js +21 -3
- package/dist/feature/observers/services/observers.js.map +1 -1
- package/dist/feature/observers/types/plan-repairs.js +36 -11
- package/dist/feature/observers/types/plan-repairs.js.map +1 -1
- package/dist/feature/queue/repositories/queues.js +28 -4
- package/dist/feature/queue/repositories/queues.js.map +1 -1
- package/dist/feature/queue/services/control.js +23 -1
- package/dist/feature/queue/services/control.js.map +1 -1
- package/dist/feature/queue/services/store.js +4 -0
- package/dist/feature/queue/services/store.js.map +1 -1
- package/dist/feature/queue/services/task-tags.js +4 -1
- package/dist/feature/queue/services/task-tags.js.map +1 -1
- package/dist/feature/queue/types/advance.js +3 -1
- package/dist/feature/queue/types/advance.js.map +1 -1
- package/dist/feature/queue/types/filter.js +36 -0
- package/dist/feature/queue/types/filter.js.map +1 -0
- package/dist/feature/queue/types/index.js +1 -0
- package/dist/feature/queue/types/index.js.map +1 -1
- package/dist/feature/queue/types/items.js +1 -0
- package/dist/feature/queue/types/items.js.map +1 -1
- package/dist/feature/queue/types/settings.js +14 -3
- package/dist/feature/queue/types/settings.js.map +1 -1
- package/dist/feature/runs/machine/repair.js +5 -1
- package/dist/feature/runs/machine/repair.js.map +1 -1
- package/dist/feature/runs/machine/steps.js +4 -4
- package/dist/feature/runs/machine/steps.js.map +1 -1
- package/dist/feature/runs/machine/transition.js +11 -1
- package/dist/feature/runs/machine/transition.js.map +1 -1
- package/dist/feature/runs/repositories/write.js +1 -1
- package/dist/feature/runs/repositories/write.js.map +1 -1
- package/dist/feature/runs/services/effects/attempts.js +21 -13
- package/dist/feature/runs/services/effects/attempts.js.map +1 -1
- package/dist/feature/runs/services/effects/effects.js +5 -0
- package/dist/feature/runs/services/effects/effects.js.map +1 -1
- package/dist/feature/runs/services/effects/runtime-check.js +20 -0
- package/dist/feature/runs/services/effects/runtime-check.js.map +1 -0
- package/dist/feature/runs/services/requests.js +7 -1
- package/dist/feature/runs/services/requests.js.map +1 -1
- package/dist/feature/runs/types/attempt.js +4 -0
- package/dist/feature/runs/types/attempt.js.map +1 -1
- package/dist/feature/swarm-config/services/index.js +1 -0
- package/dist/feature/swarm-config/services/index.js.map +1 -1
- package/dist/feature/swarm-config/services/sections/mcp-servers.js +128 -0
- package/dist/feature/swarm-config/services/sections/mcp-servers.js.map +1 -0
- package/dist/feature/swarm-config/services/validate-runtimes.js +0 -50
- package/dist/feature/swarm-config/services/validate-runtimes.js.map +1 -1
- package/dist/feature/swarm-config/services/validate-specialists.js +5 -4
- package/dist/feature/swarm-config/services/validate-specialists.js.map +1 -1
- package/dist/feature/swarm-config/services/validate.js +7 -6
- package/dist/feature/swarm-config/services/validate.js.map +1 -1
- package/dist/feature/swarm-config/types/index.js +1 -0
- package/dist/feature/swarm-config/types/index.js.map +1 -1
- package/dist/feature/swarm-config/types/mcp/reference.js +40 -0
- package/dist/feature/swarm-config/types/mcp/reference.js.map +1 -0
- package/dist/feature/swarm-config/types/merge.js +1 -0
- package/dist/feature/swarm-config/types/merge.js.map +1 -1
- package/dist/feature/swarm-config/types/settings.js +2 -0
- package/dist/feature/swarm-config/types/settings.js.map +1 -1
- package/dist/feature/swarm-config/types/specialist.js.map +1 -1
- package/dist/feature/swarm-edit/services/config-edits.js +12 -0
- package/dist/feature/swarm-edit/services/config-edits.js.map +1 -1
- package/dist/feature/swarm-edit/services/editor-view.js +2 -0
- package/dist/feature/swarm-edit/services/editor-view.js.map +1 -1
- package/dist/feature/swarm-edit/services/index.js +1 -0
- package/dist/feature/swarm-edit/services/index.js.map +1 -1
- package/dist/feature/swarm-edit/services/mcp/editor-mcp.js +51 -0
- package/dist/feature/swarm-edit/services/mcp/editor-mcp.js.map +1 -0
- package/dist/feature/swarm-edit/services/mcp/plan-mcp-server.js +93 -0
- package/dist/feature/swarm-edit/services/mcp/plan-mcp-server.js.map +1 -0
- package/dist/feature/swarm-edit/services/plan-settings.js.map +1 -1
- package/dist/feature/swarm-edit/types/editor.js.map +1 -1
- package/dist/platform/sqlite/migrations.js +1 -0
- package/dist/platform/sqlite/migrations.js.map +1 -1
- package/dist/presentation/cli/commands/queue-edit.js +23 -1
- package/dist/presentation/cli/commands/queue-edit.js.map +1 -1
- package/dist/presentation/format/queue.js +14 -1
- package/dist/presentation/format/queue.js.map +1 -1
- package/dist/presentation/ipc/contract/config.js +22 -0
- package/dist/presentation/ipc/contract/config.js.map +1 -1
- package/dist/presentation/ipc/contract/queue.js +11 -1
- package/dist/presentation/ipc/contract/queue.js.map +1 -1
- package/dist/presentation/ipc/contract/runs.js +4 -0
- package/dist/presentation/ipc/contract/runs.js.map +1 -1
- package/dist/presentation/ipc/handlers/config.js +6 -0
- package/dist/presentation/ipc/handlers/config.js.map +1 -1
- package/dist/presentation/ipc/handlers/runs.js +1 -0
- package/dist/presentation/ipc/handlers/runs.js.map +1 -1
- package/dist/presentation/ipc/snapshots.js +2 -2
- package/dist/presentation/ipc/snapshots.js.map +1 -1
- package/dist/presentation/ipc/views/observers.js +2 -2
- package/dist/presentation/ipc/views/observers.js.map +1 -1
- package/dist/presentation/ipc/views/queue.js +4 -1
- package/dist/presentation/ipc/views/queue.js.map +1 -1
- package/dist/presentation/ipc/views/runs.js +3 -4
- package/dist/presentation/ipc/views/runs.js.map +1 -1
- package/dist/presentation/mcp/host-queue-control.js +11 -2
- package/dist/presentation/mcp/host-queue-control.js.map +1 -1
- package/dist/presentation/web/routes/catalog/mcp-servers.js +50 -0
- package/dist/presentation/web/routes/catalog/mcp-servers.js.map +1 -0
- package/dist/presentation/web/routes/runs.js +5 -0
- package/dist/presentation/web/routes/runs.js.map +1 -1
- package/dist/presentation/web/server.js +2 -0
- package/dist/presentation/web/server.js.map +1 -1
- package/dist/web/assets/{FilterColumn-BCMp-JO4.js → FilterColumn-BrQWIM5F.js} +1 -1
- package/dist/web/assets/{SharedPipelinesGroup-DJRGFtzx.js → SharedPipelinesGroup-WFngQrqI.js} +1 -1
- package/dist/web/assets/{badge-C_7kALlW.js → badge-B_khFsd6.js} +1 -1
- package/dist/web/assets/{card-C9eXOVuF.js → card-COXjnc-y.js} +1 -1
- package/dist/web/assets/empty-Eb-EZDPX.js +41 -0
- package/dist/web/assets/index-DEXoIe2a.js +21 -0
- package/dist/web/assets/index-DMlIe0VD.css +2 -0
- package/dist/web/assets/locales-BlBJo1PR.js +1 -0
- package/dist/web/assets/{pipelines-DQglwIkL.js → pipelines-B3cdeex_.js} +5 -5
- package/dist/web/assets/queue-HMUImu0E.js +16 -0
- package/dist/web/assets/{select-BSqaxwh1.js → select-MHus_Unr.js} +1 -1
- package/dist/web/assets/settings-CpeEsUXX.js +6 -0
- package/dist/web/assets/skeleton-CWY1nRvW.js +1 -0
- package/dist/web/assets/specialists-BkLXuqUd.js +1 -0
- package/dist/web/assets/stats-DRg_5vll.js +1 -0
- package/dist/web/assets/topology-DGTNdDHf.js +1 -0
- package/dist/web/assets/{trash-ChYI9ms1.js → trash-CFJeuRuc.js} +1 -1
- package/dist/web/assets/{useListDrag-0GPS1X83.js → useListDrag-B7Wlt2u9.js} +1 -1
- package/dist/web/index.html +7 -7
- package/integrations/claude-code/.claude-plugin/plugin.json +1 -1
- package/package.json +1 -1
- package/dist/web/assets/empty-ACC2KkXk.js +0 -41
- package/dist/web/assets/index-CsVQUXJH.js +0 -21
- package/dist/web/assets/index-Ds1nt_qm.css +0 -2
- package/dist/web/assets/locales-fB1w2oER.js +0 -1
- package/dist/web/assets/queue-CAuAo--6.js +0 -16
- package/dist/web/assets/settings-6eHKYbS7.js +0 -2
- package/dist/web/assets/skeleton-CfLYGtNX.js +0 -1
- package/dist/web/assets/specialists-Durm0DgK.js +0 -1
- package/dist/web/assets/stats-67akPa3A.js +0 -1
- package/dist/web/assets/topology-DQu3su19.js +0 -1
package/dist/app/application.js
CHANGED
|
@@ -172,7 +172,13 @@ function wire(ports, services, publisher) {
|
|
|
172
172
|
const publications = publisher.ports();
|
|
173
173
|
ports.repos.set(publications.repos);
|
|
174
174
|
ports.tags.set(publications.tags);
|
|
175
|
-
|
|
175
|
+
// Settings of a runtime may have changed: observers look at the incidents again.
|
|
176
|
+
ports.config.set({
|
|
177
|
+
configChanged: (repository) => {
|
|
178
|
+
publications.config.configChanged(repository);
|
|
179
|
+
services.observers.request();
|
|
180
|
+
},
|
|
181
|
+
});
|
|
176
182
|
ports.processes.set(publications.processes);
|
|
177
183
|
// Every saved run reaches the clients first, then the usage journal.
|
|
178
184
|
ports.runs.set({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../src/app/application.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../src/app/application.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,8 @@ const policySchema = z.object({
|
|
|
7
7
|
allowCommands: z.array(z.string()),
|
|
8
8
|
server: z.string(),
|
|
9
9
|
tools: z.array(z.string()),
|
|
10
|
+
/** Names of the attempt of the MCP servers of the specialist; absent in older policies. */
|
|
11
|
+
servers: z.array(z.string()).default([]),
|
|
10
12
|
});
|
|
11
13
|
const hookSchema = z.object({
|
|
12
14
|
toolCall: z.object({ name: z.string(), args: z.record(z.string(), z.unknown()) }),
|
|
@@ -26,16 +28,32 @@ const READ_PATHS = {
|
|
|
26
28
|
find_by_name: 'SearchDirectory',
|
|
27
29
|
grep_search: 'SearchPath',
|
|
28
30
|
};
|
|
31
|
+
/** The server a tool name `mcp_<server>_<tool>` belongs to: the longest name that fits. */
|
|
32
|
+
function ownerOf(policy, name) {
|
|
33
|
+
if (!name.startsWith('mcp_'))
|
|
34
|
+
return null;
|
|
35
|
+
const rest = name.slice(4);
|
|
36
|
+
const owners = [policy.server, ...policy.servers].filter((server) => server !== '' && rest.startsWith(`${server}_`));
|
|
37
|
+
return owners.sort((a, b) => b.length - a.length)[0] ?? null;
|
|
38
|
+
}
|
|
29
39
|
function mcpAllowed(policy, name, args) {
|
|
30
|
-
|
|
31
|
-
|
|
40
|
+
const worker = policy.server;
|
|
41
|
+
const own = (server) => typeof server === 'string' && (server === worker || policy.servers.includes(server));
|
|
32
42
|
if (name === 'list_resources' || name === 'read_resource')
|
|
33
|
-
return args.ServerName
|
|
34
|
-
if (name === 'call_mcp_tool')
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
43
|
+
return own(args.ServerName);
|
|
44
|
+
if (name === 'call_mcp_tool') {
|
|
45
|
+
if (!own(args.ServerName))
|
|
46
|
+
return false;
|
|
47
|
+
if (args.ServerName !== worker)
|
|
48
|
+
return true;
|
|
49
|
+
return typeof args.ToolName === 'string' && policy.tools.includes(args.ToolName);
|
|
50
|
+
}
|
|
51
|
+
const owner = ownerOf(policy, name);
|
|
52
|
+
if (owner === null)
|
|
53
|
+
return false;
|
|
54
|
+
if (owner !== worker)
|
|
55
|
+
return true;
|
|
56
|
+
return policy.tools.includes(name.slice(`mcp_${worker}_`.length));
|
|
39
57
|
}
|
|
40
58
|
function permit(policy, name, args) {
|
|
41
59
|
if (policy.permissions === 'none')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"guard.js","sourceRoot":"","sources":["../../../../../src/feature/agents/clients/agy/guard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5B,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACrD,aAAa,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAClC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"guard.js","sourceRoot":"","sources":["../../../../../src/feature/agents/clients/agy/guard.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import { PROTECTED_GIT_COMMANDS } from '../../types/index.js';
|
|
2
|
+
/** Names of the attempt of the MCP servers of the specialist: `<worker>-<name>`. */
|
|
3
|
+
export function agyServerNames(context, worker) {
|
|
4
|
+
return Object.keys(context.specialist.mcp ?? {}).map((name) => `${worker}-${name}`);
|
|
5
|
+
}
|
|
2
6
|
/** Precise command checks belong to PreToolUse, not agy's broader native prefix rules. */
|
|
3
7
|
export function agySettings(context, server) {
|
|
4
8
|
const { permissions } = context.specialist;
|
|
@@ -9,7 +13,11 @@ export function agySettings(context, server) {
|
|
|
9
13
|
allowNonWorkspaceAccess: permissions === 'full',
|
|
10
14
|
artifactReviewPolicy: 'always-proceed',
|
|
11
15
|
permissions: {
|
|
12
|
-
allow: [
|
|
16
|
+
allow: [
|
|
17
|
+
`read_file(${context.worktree})`,
|
|
18
|
+
`mcp(${server}/*)`,
|
|
19
|
+
...agyServerNames(context, server).map((name) => `mcp(${name}/*)`),
|
|
20
|
+
],
|
|
13
21
|
ask: [],
|
|
14
22
|
deny: [
|
|
15
23
|
...(permissions === 'read' ? ['write_file(*)', 'command(*)'] : []),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../../../../src/feature/agents/clients/agy/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAsB,MAAM,sBAAsB,CAAC;AAElF,0FAA0F;AAC1F,MAAM,UAAU,WAAW,CAAC,OAAsB,EAAE,MAAc;IAChE,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC;IAC3C,OAAO;QACL,SAAS,EAAE,WAAW,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc;QACvD,cAAc,EAAE,WAAW,KAAK,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB;QAC5E,qBAAqB,EAAE,KAAK;QAC5B,uBAAuB,EAAE,WAAW,KAAK,MAAM;QAC/C,oBAAoB,EAAE,gBAAgB;QACtC,WAAW,EAAE;YACX,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../../../../src/feature/agents/clients/agy/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAsB,MAAM,sBAAsB,CAAC;AAElF,oFAAoF;AACpF,MAAM,UAAU,cAAc,CAAC,OAAsB,EAAE,MAAc;IACnE,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,MAAM,IAAI,IAAI,EAAE,CAAC,CAAC;AACtF,CAAC;AAED,0FAA0F;AAC1F,MAAM,UAAU,WAAW,CAAC,OAAsB,EAAE,MAAc;IAChE,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC;IAC3C,OAAO;QACL,SAAS,EAAE,WAAW,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc;QACvD,cAAc,EAAE,WAAW,KAAK,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB;QAC5E,qBAAqB,EAAE,KAAK;QAC5B,uBAAuB,EAAE,WAAW,KAAK,MAAM;QAC/C,oBAAoB,EAAE,gBAAgB;QACtC,WAAW,EAAE;YACX,KAAK,EAAE;gBACL,aAAa,OAAO,CAAC,QAAQ,GAAG;gBAChC,OAAO,MAAM,KAAK;gBAClB,GAAG,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,IAAI,KAAK,CAAC;aACnE;YACD,GAAG,EAAE,EAAE;YACP,IAAI,EAAE;gBACJ,GAAG,CAAC,WAAW,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAClE,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,WAAW,OAAO,GAAG,CAAC;aAClE;SACF;KACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,SAAS,EAAE,EAAE;IACb,cAAc,EAAE,gBAAgB;IAChC,qBAAqB,EAAE,KAAK;IAC5B,oBAAoB,EAAE,gBAAgB;IACtC,uBAAuB,EAAE,KAAK;IAC9B,WAAW,EAAE;QACX,KAAK,EAAE,EAAE;QACT,GAAG,EAAE,EAAE;QACP,IAAI,EAAE;YACJ,cAAc;YACd,eAAe;YACf,YAAY;YACZ,aAAa;YACb,gBAAgB;YAChB,QAAQ;SACT;KACF;CACF,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { dirname, join } from 'node:path';
|
|
2
2
|
import { systemPrompt, userMessage, workerToolNames, } from '../../types/index.js';
|
|
3
3
|
import { createAgyParser } from './parser.js';
|
|
4
|
-
import { agySettings, AGY_ONE_SHOT_SETTINGS } from './permissions.js';
|
|
4
|
+
import { agyServerNames, agySettings, AGY_ONE_SHOT_SETTINGS } from './permissions.js';
|
|
5
5
|
import { agyTranscript } from './transcript.js';
|
|
6
6
|
import { agyHookFiles } from './hooks.js';
|
|
7
7
|
function launch(executable, extra, context) {
|
|
@@ -22,6 +22,7 @@ function launch(executable, extra, context) {
|
|
|
22
22
|
allowCommands: context.specialist.allowCommands,
|
|
23
23
|
server,
|
|
24
24
|
tools,
|
|
25
|
+
servers: agyServerNames(context, server),
|
|
25
26
|
};
|
|
26
27
|
return {
|
|
27
28
|
command: executable,
|
|
@@ -47,6 +48,10 @@ function launch(executable, extra, context) {
|
|
|
47
48
|
path: join(directory, '.agents', 'mcp_config.json'),
|
|
48
49
|
content: JSON.stringify({
|
|
49
50
|
mcpServers: {
|
|
51
|
+
...Object.fromEntries(Object.entries(context.specialist.mcp ?? {}).map(([name, own]) => [
|
|
52
|
+
`${server}-${name}`,
|
|
53
|
+
{ command: own.command, args: own.args, env: own.env },
|
|
54
|
+
])),
|
|
50
55
|
[server]: {
|
|
51
56
|
command,
|
|
52
57
|
args,
|
|
@@ -87,6 +92,7 @@ function oneShot(executable, extra, request) {
|
|
|
87
92
|
allowCommands: [],
|
|
88
93
|
server: '',
|
|
89
94
|
tools: [],
|
|
95
|
+
servers: [],
|
|
90
96
|
}),
|
|
91
97
|
],
|
|
92
98
|
sessionId: null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../../../src/feature/agents/clients/agy/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,EACL,YAAY,EACZ,WAAW,EACX,eAAe,GAMhB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../../../src/feature/agents/clients/agy/runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,7 +75,18 @@ function launch(executable, extra, context) {
|
|
|
75
75
|
const agent = opencodeAgentName(context.specialist.slug);
|
|
76
76
|
const config = {
|
|
77
77
|
$schema: 'https://opencode.ai/config.json',
|
|
78
|
-
mcp: {
|
|
78
|
+
mcp: {
|
|
79
|
+
...Object.fromEntries(Object.entries(context.specialist.mcp ?? {}).map(([name, server]) => [
|
|
80
|
+
name,
|
|
81
|
+
{
|
|
82
|
+
type: 'local',
|
|
83
|
+
command: [server.command, ...server.args],
|
|
84
|
+
environment: server.env,
|
|
85
|
+
enabled: true,
|
|
86
|
+
},
|
|
87
|
+
])),
|
|
88
|
+
aip: { type: 'local', command: context.workerCommand, enabled: true },
|
|
89
|
+
},
|
|
79
90
|
agent: {
|
|
80
91
|
[agent]: {
|
|
81
92
|
description: `aip specialist ${context.specialist.name}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../../../src/feature/agents/clients/opencode/runtime.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../../../src/feature/agents/clients/opencode/runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/feature/agents/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/feature/agents/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import { parseReferences } from '../../../swarm-config/types/index.js';
|
|
2
|
+
function expandValue(value, variables) {
|
|
3
|
+
const parsed = parseReferences(value);
|
|
4
|
+
// The configuration is validated when it loads; a snapshot of another build is kept as text.
|
|
5
|
+
if ('error' in parsed)
|
|
6
|
+
return value;
|
|
7
|
+
let result = '';
|
|
8
|
+
for (const token of parsed.tokens) {
|
|
9
|
+
if ('text' in token) {
|
|
10
|
+
result += token.text;
|
|
11
|
+
continue;
|
|
12
|
+
}
|
|
13
|
+
const variable = variables[token.variable];
|
|
14
|
+
if (variable === undefined)
|
|
15
|
+
return { missing: token.variable };
|
|
16
|
+
result += variable;
|
|
17
|
+
}
|
|
18
|
+
return result;
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* Replaces `${NAME}` in the `args` and `env` of the servers by the values of `variables`; `$${`
|
|
22
|
+
* stays the literal text `${`. A variable that is not set gives an error naming the server and
|
|
23
|
+
* the variable. The servers given are not changed.
|
|
24
|
+
*/
|
|
25
|
+
export function expandMcpServers(servers, variables) {
|
|
26
|
+
const result = {};
|
|
27
|
+
for (const [name, server] of Object.entries(servers)) {
|
|
28
|
+
const args = [];
|
|
29
|
+
const env = {};
|
|
30
|
+
const values = [
|
|
31
|
+
...server.args.map((value, index) => ({
|
|
32
|
+
value,
|
|
33
|
+
set: (text) => (args[index] = text),
|
|
34
|
+
})),
|
|
35
|
+
...Object.entries(server.env).map(([key, value]) => ({
|
|
36
|
+
value,
|
|
37
|
+
set: (text) => (env[key] = text),
|
|
38
|
+
})),
|
|
39
|
+
];
|
|
40
|
+
for (const { value, set } of values) {
|
|
41
|
+
const expanded = expandValue(value, variables);
|
|
42
|
+
if (typeof expanded !== 'string') {
|
|
43
|
+
return {
|
|
44
|
+
ok: false,
|
|
45
|
+
error: `MCP server ${name}: environment variable ${expanded.missing} is not set`,
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
set(expanded);
|
|
49
|
+
}
|
|
50
|
+
result[name] = { command: server.command, args, env };
|
|
51
|
+
}
|
|
52
|
+
return { ok: true, servers: result };
|
|
53
|
+
}
|
|
54
|
+
//# sourceMappingURL=env.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../../../../src/feature/agents/types/mcp/env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAkB,MAAM,sCAAsC,CAAC;AAOvF,SAAS,WAAW,CAAC,KAAa,EAAE,SAAoB;IACtD,MAAM,MAAM,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IACtC,6FAA6F;IAC7F,IAAI,OAAO,IAAI,MAAM;QAAE,OAAO,KAAK,CAAC;IACpC,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QAClC,IAAI,MAAM,IAAI,KAAK,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC;YACrB,SAAS;QACX,CAAC;QACD,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAI,QAAQ,KAAK,SAAS;YAAE,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC/D,MAAM,IAAI,QAAQ,CAAC;IACrB,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAC9B,OAA4C,EAC5C,SAAoB;IAEpB,MAAM,MAAM,GAA8B,EAAE,CAAC;IAC7C,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACrD,MAAM,IAAI,GAAa,EAAE,CAAC;QAC1B,MAAM,GAAG,GAA2B,EAAE,CAAC;QACvC,MAAM,MAAM,GAAG;YACb,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;gBACpC,KAAK;gBACL,GAAG,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;aAC5C,CAAC,CAAC;YACH,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;gBACnD,KAAK;gBACL,GAAG,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;aACzC,CAAC,CAAC;SACJ,CAAC;QACF,KAAK,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,MAAM,EAAE,CAAC;YACpC,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YAC/C,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBACjC,OAAO;oBACL,EAAE,EAAE,KAAK;oBACT,KAAK,EAAE,cAAc,IAAI,0BAA0B,QAAQ,CAAC,OAAO,aAAa;iBACjF,CAAC;YACJ,CAAC;YACD,GAAG,CAAC,QAAQ,CAAC,CAAC;QAChB,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IACxD,CAAC;IACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;AACvC,CAAC"}
|
|
@@ -2,7 +2,7 @@ import { isRejected, rejected } from '../../../platform/errors/index.js';
|
|
|
2
2
|
import { currentPermissions } from '../../runs/services/index.js';
|
|
3
3
|
import { REPAIR_GROUP, findGroup, isServiceGroup, isSplitGroup, limitHolds, } from '../../runs/types/index.js';
|
|
4
4
|
import { validateObserverProfile } from '../../swarm-config/services/index.js';
|
|
5
|
-
import { defaultObserverSettings, personQuestions, planRepairs,
|
|
5
|
+
import { defaultObserverSettings, personQuestions, planRepairs, repairIncidents, repairPolicy, waitsForPerson, } from '../types/index.js';
|
|
6
6
|
import { checkObserverSettings } from './settings-check.js';
|
|
7
7
|
/** The observers: they take the incidents of runs and repair them like a person would. */
|
|
8
8
|
export class ObserverService {
|
|
@@ -23,7 +23,25 @@ export class ObserverService {
|
|
|
23
23
|
}
|
|
24
24
|
/** Whether an observer takes the incident of the run: then the queue does not stop for it. */
|
|
25
25
|
takesIncident(state) {
|
|
26
|
-
return
|
|
26
|
+
return this.policy().takesIncident(state);
|
|
27
|
+
}
|
|
28
|
+
/** The decisions about incidents by the current settings and the runtimes available now. */
|
|
29
|
+
policy() {
|
|
30
|
+
return repairPolicy(this.current, this.unavailability());
|
|
31
|
+
}
|
|
32
|
+
/** Whether a runtime is off or not found in a repository; looked up once per pair. */
|
|
33
|
+
unavailability() {
|
|
34
|
+
const known = new Map();
|
|
35
|
+
return (repository, runtime) => {
|
|
36
|
+
const key = `${repository}\0${runtime}`;
|
|
37
|
+
let value = known.get(key);
|
|
38
|
+
if (value === undefined) {
|
|
39
|
+
const kind = this.dependencies.runs.effects.runtimeProblem(repository, runtime)?.kind;
|
|
40
|
+
value = kind === 'runtime_disabled' || kind === 'runtime_not_found';
|
|
41
|
+
known.set(key, value);
|
|
42
|
+
}
|
|
43
|
+
return value;
|
|
44
|
+
};
|
|
27
45
|
}
|
|
28
46
|
/** Looks at the incidents of the runs once, however many changes arrive meanwhile. */
|
|
29
47
|
request() {
|
|
@@ -74,7 +92,7 @@ export class ObserverService {
|
|
|
74
92
|
if (specialist) {
|
|
75
93
|
// Over all runs, so the repairs of the waiting repositories count against the workers.
|
|
76
94
|
const holds = limitHolds(all, now());
|
|
77
|
-
for (const { state, incident } of planRepairs(settings, all, holds)) {
|
|
95
|
+
for (const { state, incident } of planRepairs(settings, all, holds, this.unavailability())) {
|
|
78
96
|
if (pending(state))
|
|
79
97
|
continue;
|
|
80
98
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"observers.js","sourceRoot":"","sources":["../../../../src/feature/observers/services/observers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAGzE,OAAO,EAAE,kBAAkB,EAAqB,MAAM,8BAA8B,CAAC;AACrF,OAAO,EACL,YAAY,EACZ,SAAS,EACT,cAAc,EACd,YAAY,EACZ,UAAU,GAGX,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAI/E,OAAO,EACL,uBAAuB,EACvB,eAAe,EACf,WAAW,EACX,
|
|
1
|
+
{"version":3,"file":"observers.js","sourceRoot":"","sources":["../../../../src/feature/observers/services/observers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
import { allGroups, findGroup, runProblems, } from '../../runs/types/index.js';
|
|
2
2
|
/** The runtime whose usage limit holds repairs when the profile names none. */
|
|
3
3
|
const DEFAULT_OBSERVER_RUNTIME = 'claude';
|
|
4
|
+
/** The default: every runtime is available. */
|
|
5
|
+
export const ALL_AVAILABLE = () => false;
|
|
6
|
+
/** The runtime the observer works on: the one its profile names, `claude` by default. */
|
|
7
|
+
export function observerRuntime(settings) {
|
|
8
|
+
return typeof settings.specialist.runtime === 'string'
|
|
9
|
+
? settings.specialist.runtime
|
|
10
|
+
: DEFAULT_OBSERVER_RUNTIME;
|
|
11
|
+
}
|
|
4
12
|
const KINDS = {
|
|
5
13
|
needs_human: 'question',
|
|
6
14
|
failed: 'failed',
|
|
@@ -25,11 +33,19 @@ export function waitsForPerson(group) {
|
|
|
25
33
|
export function personQuestions(state) {
|
|
26
34
|
return allGroups(state).filter((group) => group.slug !== '_repair' && waitsForPerson(group));
|
|
27
35
|
}
|
|
36
|
+
/** Whether the last attempt of the group failed because its runtime is unavailable still. */
|
|
37
|
+
function waitsForRuntime(group, repository, unavailable) {
|
|
38
|
+
const attempt = group.attempts.at(-1);
|
|
39
|
+
const kind = attempt?.reason?.kind;
|
|
40
|
+
return (attempt !== undefined &&
|
|
41
|
+
(kind === 'runtime_disabled' || kind === 'runtime_not_found') &&
|
|
42
|
+
unavailable(repository, attempt.runtime));
|
|
43
|
+
}
|
|
28
44
|
/**
|
|
29
45
|
* Incidents of a task an observer may repair: the problems of the run without the ones a person
|
|
30
46
|
* caused (`cancelled`) or time solves (`usage_limit`), without questions for a person only, and without the incidents the observer already reported on.
|
|
31
47
|
*/
|
|
32
|
-
export function repairIncidents(state) {
|
|
48
|
+
export function repairIncidents(state, unavailable = ALL_AVAILABLE) {
|
|
33
49
|
const taken = new Set(state.run.repair.taken);
|
|
34
50
|
const incidents = [];
|
|
35
51
|
for (const problem of runProblems(state)) {
|
|
@@ -41,21 +57,33 @@ export function repairIncidents(state) {
|
|
|
41
57
|
continue;
|
|
42
58
|
if (kind === 'question' && group.humanOnly !== null)
|
|
43
59
|
continue;
|
|
60
|
+
if (kind === 'failed' && waitsForRuntime(group, state.run.repository, unavailable))
|
|
61
|
+
continue;
|
|
44
62
|
incidents.push({ key: problem.key, kind, group: group.slug, detail: detailOf(group, kind) });
|
|
45
63
|
}
|
|
46
64
|
return incidents;
|
|
47
65
|
}
|
|
48
66
|
/**
|
|
49
67
|
* Whether an observer may take the incidents of a task: observers are on, the project is
|
|
50
|
-
* connected, the task is not forbidden to them, it has no hold
|
|
68
|
+
* connected, the task is not forbidden to them, it has no hold, its repairs are not used up and
|
|
69
|
+
* the runtime of the observer is available in the project.
|
|
51
70
|
*/
|
|
52
|
-
export function repairAdmitted(state, settings) {
|
|
71
|
+
export function repairAdmitted(state, settings, unavailable = ALL_AVAILABLE) {
|
|
53
72
|
const { run } = state;
|
|
54
73
|
return (settings.enabled &&
|
|
55
74
|
settings.projects.some((project) => project.repository === run.repository) &&
|
|
56
75
|
run.repair.allowed &&
|
|
57
76
|
run.hold === null &&
|
|
58
|
-
run.repair.repairs < settings.maxRepairs
|
|
77
|
+
run.repair.repairs < settings.maxRepairs &&
|
|
78
|
+
!unavailable(run.repository, observerRuntime(settings)));
|
|
79
|
+
}
|
|
80
|
+
/** The policy of the settings under the availability of runtimes. */
|
|
81
|
+
export function repairPolicy(settings, unavailable = ALL_AVAILABLE) {
|
|
82
|
+
return {
|
|
83
|
+
takesIncident: (state) => repairIncidents(state, unavailable).length > 0 &&
|
|
84
|
+
repairAdmitted(state, settings, unavailable),
|
|
85
|
+
admitted: (state) => repairAdmitted(state, settings, unavailable),
|
|
86
|
+
};
|
|
59
87
|
}
|
|
60
88
|
/** When the state of an incident began (ms); the older an incident, the sooner it is repaired. */
|
|
61
89
|
function incidentSince(state, incident) {
|
|
@@ -69,13 +97,10 @@ function incidentSince(state, incident) {
|
|
|
69
97
|
* the moment it resets; the repairs running now count against `workers` and `maxWorkers`, a task
|
|
70
98
|
* has one repair at a time, and the oldest incidents go first.
|
|
71
99
|
*/
|
|
72
|
-
export function planRepairs(settings, states, holds) {
|
|
100
|
+
export function planRepairs(settings, states, holds, unavailable = ALL_AVAILABLE) {
|
|
73
101
|
if (!settings.enabled)
|
|
74
102
|
return [];
|
|
75
|
-
|
|
76
|
-
? settings.specialist.runtime
|
|
77
|
-
: DEFAULT_OBSERVER_RUNTIME;
|
|
78
|
-
if (holds.has(runtime))
|
|
103
|
+
if (holds.has(observerRuntime(settings)))
|
|
79
104
|
return [];
|
|
80
105
|
const all = [...states];
|
|
81
106
|
let running = 0;
|
|
@@ -88,9 +113,9 @@ export function planRepairs(settings, states, holds) {
|
|
|
88
113
|
}
|
|
89
114
|
const candidates = [];
|
|
90
115
|
for (const state of all) {
|
|
91
|
-
if (state.run.repair.incident !== null || !repairAdmitted(state, settings))
|
|
116
|
+
if (state.run.repair.incident !== null || !repairAdmitted(state, settings, unavailable))
|
|
92
117
|
continue;
|
|
93
|
-
const found = repairIncidents(state)
|
|
118
|
+
const found = repairIncidents(state, unavailable)
|
|
94
119
|
// Another delivery of the task goes on: its refusal is not a state to repair yet.
|
|
95
120
|
.filter((incident) => incident.kind !== 'delivery' || state.run.pendingDelivery === null)
|
|
96
121
|
.map((incident) => ({ incident, since: incidentSince(state, incident) }))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-repairs.js","sourceRoot":"","sources":["../../../../src/feature/observers/types/plan-repairs.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,SAAS,EACT,SAAS,EACT,WAAW,GACZ,MAAM,2BAA2B,CAAC;AAGnC,+EAA+E;AAC/E,MAAM,wBAAwB,GAAG,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"plan-repairs.js","sourceRoot":"","sources":["../../../../src/feature/observers/types/plan-repairs.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,13 @@ export class QueueRepository {
|
|
|
30
30
|
WHERE repository = ? AND EXISTS (SELECT 1 FROM json_each(tags_json) WHERE value = ?)`)
|
|
31
31
|
.run(id, repository, id);
|
|
32
32
|
}
|
|
33
|
+
/** One statement, no transaction of its own: the scenario of removing a tag opens it. */
|
|
34
|
+
dropFilterTag(repository, id) {
|
|
35
|
+
this.database
|
|
36
|
+
.prepare(`UPDATE queues SET filter_json = json_set(filter_json, '$.tags', (SELECT json_group_array(value) FROM json_each(filter_json, '$.tags') WHERE value <> ?))
|
|
37
|
+
WHERE repository = ? AND EXISTS (SELECT 1 FROM json_each(filter_json, '$.tags') WHERE value = ?)`)
|
|
38
|
+
.run(id, repository, id);
|
|
39
|
+
}
|
|
33
40
|
/** No transaction of its own: the queue of a project that moved gets its new path. */
|
|
34
41
|
moveQueue(from, to) {
|
|
35
42
|
this.database.exec('PRAGMA defer_foreign_keys = ON');
|
|
@@ -41,10 +48,10 @@ export class QueueRepository {
|
|
|
41
48
|
saveQueue(queue) {
|
|
42
49
|
this.database.transaction(() => {
|
|
43
50
|
this.database
|
|
44
|
-
.prepare(`INSERT INTO queues (repository, status, parallel, runs_json, acknowledged_json, stop_json, updated_at, autopilot, skip_failed, skipped_json, autopilot_answer, on_limit, next_number, priority_json, auto_answer)
|
|
45
|
-
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
46
|
-
ON CONFLICT (repository) DO UPDATE SET status = excluded.status, parallel = excluded.parallel, runs_json = excluded.runs_json, acknowledged_json = excluded.acknowledged_json, stop_json = excluded.stop_json, updated_at = excluded.updated_at, autopilot = excluded.autopilot, skip_failed = excluded.skip_failed, skipped_json = excluded.skipped_json, autopilot_answer = excluded.autopilot_answer, on_limit = excluded.on_limit, next_number = excluded.next_number, priority_json = excluded.priority_json, auto_answer = excluded.auto_answer`)
|
|
47
|
-
.run(queue.repository, queue.status, queue.parallel, JSON.stringify(queue.runs), JSON.stringify(queue.acknowledged), json(queue.stop), queue.updatedAt, queue.autopilot ? 1 : 0, queue.skipFailed ? 1 : 0, JSON.stringify(queue.skipped), queue.autopilotAnswer, queue.onLimit, queue.nextNumber, JSON.stringify(queue.priority), queue.autoAnswer ? 1 : 0);
|
|
51
|
+
.prepare(`INSERT INTO queues (repository, status, parallel, runs_json, acknowledged_json, stop_json, updated_at, autopilot, skip_failed, skipped_json, autopilot_answer, on_limit, next_number, priority_json, auto_answer, filter_json)
|
|
52
|
+
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
53
|
+
ON CONFLICT (repository) DO UPDATE SET status = excluded.status, parallel = excluded.parallel, runs_json = excluded.runs_json, acknowledged_json = excluded.acknowledged_json, stop_json = excluded.stop_json, updated_at = excluded.updated_at, autopilot = excluded.autopilot, skip_failed = excluded.skip_failed, skipped_json = excluded.skipped_json, autopilot_answer = excluded.autopilot_answer, on_limit = excluded.on_limit, next_number = excluded.next_number, priority_json = excluded.priority_json, auto_answer = excluded.auto_answer, filter_json = excluded.filter_json`)
|
|
54
|
+
.run(queue.repository, queue.status, queue.parallel, JSON.stringify(queue.runs), JSON.stringify(queue.acknowledged), json(queue.stop), queue.updatedAt, queue.autopilot ? 1 : 0, queue.skipFailed ? 1 : 0, JSON.stringify(queue.skipped), queue.autopilotAnswer, queue.onLimit, queue.nextNumber, JSON.stringify(queue.priority), queue.autoAnswer ? 1 : 0, JSON.stringify(queue.filter));
|
|
48
55
|
this.database.prepare('DELETE FROM queue_items WHERE repository = ?').run(queue.repository);
|
|
49
56
|
const insert = this.database.prepare(`INSERT INTO queue_items (id, repository, position, pipeline, task, groups_json, title, error, created_at, auto_deliver, tags_json, skip_json, after_json, delivery_mode, run_id, postponed, number)
|
|
50
57
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`);
|
|
@@ -68,6 +75,7 @@ export class QueueRepository {
|
|
|
68
75
|
onLimit: ON_LIMIT_MODES.find((mode) => mode === row.on_limit) ?? 'wait',
|
|
69
76
|
nextNumber: Number(row.next_number ?? 1),
|
|
70
77
|
priority: row.priority_json ? parse(row.priority_json) : [],
|
|
78
|
+
filter: hydrateFilter(row.filter_json),
|
|
71
79
|
items: items.map(hydrateItem),
|
|
72
80
|
runs: parse(row.runs_json ?? null),
|
|
73
81
|
acknowledged: parse(row.acknowledged_json ?? null),
|
|
@@ -76,6 +84,22 @@ export class QueueRepository {
|
|
|
76
84
|
};
|
|
77
85
|
}
|
|
78
86
|
}
|
|
87
|
+
function strings(value) {
|
|
88
|
+
return Array.isArray(value)
|
|
89
|
+
? value.filter((entry) => typeof entry === 'string')
|
|
90
|
+
: [];
|
|
91
|
+
}
|
|
92
|
+
function hydrateFilter(value) {
|
|
93
|
+
let parsed = null;
|
|
94
|
+
try {
|
|
95
|
+
parsed = typeof value === 'string' ? JSON.parse(value) : null;
|
|
96
|
+
}
|
|
97
|
+
catch {
|
|
98
|
+
parsed = null;
|
|
99
|
+
}
|
|
100
|
+
const filter = typeof parsed === 'object' && parsed !== null ? parsed : {};
|
|
101
|
+
return { pipelines: strings(filter.pipelines), tags: strings(filter.tags) };
|
|
102
|
+
}
|
|
79
103
|
function hydrateItem(item) {
|
|
80
104
|
return {
|
|
81
105
|
id: String(item.id),
|